Added base controller