Some changes on list module