little change in architecture (prepare for tiles update!)