Added few new constraint (still buggy)