I think this syntax is deprecated. I'll refactor the factories in a bit.