Change decode body to adapt list