Reiterating here that splitting this in two for each action type would be nice.