expanding to support all my modules