Added CommitmentEntityManager for server integration