Updated PageElementFactory