Change the implement from AXOIM to POJO