Fixed improperly configured key/value classes