added new tags and attributes to the generator