Move configuration to seperate class