Cleaning out the ModelController further and improving the importer code. Making it ajumamoro compatible