Updated with trait-specific keywords