Add Logging and a static access class