Updates to main entry point and controller