MOD-491 :Implement choice fields graph and refactor code