[#80] Updated DrawableShapeFactory.