model: reactoring entity now based on hash map