Added config and a few more classes.
Merge remote-tracking branch 'GitHub-9741/master' into master2