Added inner ranges and constraints