Added initial constraints and some more methods