Got rid of the Dummy class