Added basic support for native session, take two