Working on automatic model annotation