Refactor AA Model & Rpc