Added factory, sort methods alphabetically