Refactored magical const_added invocation.
Enclose definition in proper modules.
Fix conflict