Added enhancements suggested by CC Cataloging