Merging additions to RowPermissions system