New loader and small structure fixes
Merge pull request #24 from Mirantis/new_loader

New loader and small structure fixes