Update to allow key properties to be named "Id" 

Updated to allow key properties to be named "Id." Change made in a way to prevent breaking existing users. "ID" will override "Id"