Fix session interface