Missing annotation
Merge branch 'master' into Documents
Fleshed out user types