Some entity setter changes