Used public API instead of impl-one