Added more types. Modified the output format