Added tagged schema