Making shape plot modular