Added constraint parsing