Added support for {{@index}} or {{@key}}
Added suppoer for comments