Moved tag into the module