Some code refactor to improve saving, added comments to show where more controllers should be initialized