Fixed session handler merging