Moved configuration to seperate class