Added more @default definitions
Added @type and @default