James | Modified class factories