Implemented new config setup, TODO for testing