Extended to properly create tags and activities