Added keywords and annotation rendering