Moved Config to Separate Class