Include type in output. Closes #9