some changes toward immutable entities