Gut TypeDSL, replace with Type, use attribute to define types