Changed to flexible config systt