Added some more typer data targets