Updated the tags to fit the new modell