Adding constraints checking