fixing build, adding other modules