changes file from master. should not be deleted
fixed rock property handling for metadata