CHANGE: Removed not used auto generated code + customized to enable, key and value.