Removed some annotation parameters to simplify usage. Tools should be able to figure out relationships via type hierarchy.
Merge branch 'refs/remotes/origin/master'