Added some code to the shape manager.