Even more structure added