Updated to extend BaseActivity