Session now works with defined keys only