Pull out type for parsing signature
Fix typos in error message tect
Include Environment when parsing
Move parse define