PROMOS - Remove module dependency
Refactor - removed return statements
PROMOS - Added bindonce directive