Entities constraints #77

-some constraints edited. Job is not done yet