Adding CLI for Entity and Constraints