Use public API types