CommandFactory added, now the parser uses it.