Refactor to add the class objects.