Merge some cases to avoid duplicated logic