Removed static instance of Configuration