Warning about code being unstable right now :)
Refactored mgmtlib
Template changes