#201 - Adding missing import statements and refactoring to use getBaseContext()