Adding basic annotation functionality