Issue #334: Added annotations for module manager