Cleaned up and added central config