Changed objects to classes
Merge branch 'refs/heads/wip'