Annotate constructor and record field definitions
Add a test for types
Rebase tests