Classes and docs updated