Added additional factory classes