Removed unecessary class, created auto generated Name property