Added support for option -record for "end element". When specified