Refactored type array and annotations