Updated to change to a class instead of the datatype