Fixed missing type declarations
Merge branch 'day5-generics'