Fix output format. Add 2 basic types.