Rlock wrapper deleted; CatalogAction refactoring