Refactor involvements

Do not merge it, but please feel free to review and comment it.