Added separate controllers