Replced hashmaps by self-made entities