`Shape` is now used by everything, and added better visibility