[TASK] better annotations