Added back convenience re-exports