Factory classes
Documentation fixes