Session refactor using the native interface.