Fix the publisher lib to work with new hierarchy