Refactor batch actions to use data behavior