Update to handle RLP catalog and offload a lot of common stuff to metautils
Rename