More work on warehouse catalog.