Move constraints into