Added basic controller functions