Fixed some issues and removed Controller package dependency.