Converted objects to be an array and added helper methods