Simplify bypassing implementation