Added additional re-exports