Add authentication context to configuration
Reformat to be consistent with rest of project
Add environment to properties
Optimize imports