Improve data:load command
Fix the app:remove command --force option
Fix __collection template mapping

This really needs to be refactored