Refactor Shape Factories to support extensibility to shapes available for authoring