added full database and session support