Updated Classes to return results