Moved configuration to config file