Changed Activity to BaseActivity for .java files