More work on custom attributes, changed to string keyname