updated to add propertyPrefix and code to set properties if set