Removed the need of the Name property