Modifications to extend BaseActivity