add proper annotations