Added the ability to configure which shapes to use.