Add @type support. References #3