Added type re-exports