Updated module Manager