Removing DI for token entity
Introducing interfaces for a mappers layer