US52: TA151: Re-factoring data models