More work on annotation library #15