Start adding annotations and additional type support.