Updated Classes to return results
Merge branch 'dev'