Use predefined primitive types
Add terminal
Add missing define