Updated to use type-parser-0.4.0