Added Subclassed factories