Cleaning the code, setting default value to enabled=false for the new feature.