Added annotations for templating. This broke the backwards compatibility.