Updated base controller & fix dependencies