Added commitment integration to the server end and fixed the entity
manager for the commitments