Using associated objects instead of locked map