add modules
Move method to service