Added more things on dynamic module