Added remaining controllers