Added additional factories