improvment of the architecture to be able to easily add modules for new services