ModelAttorney improvements