After some discussion, we decided to group those together since they should follow a similar pattern during implementation.