Updated Block and Pan to support the new Diagram