Started adding specs for type definitions and annotations