map integration, slots with passed time, refactoring