Added new classes to return the results