Two more entities have been moved to amqp/