Added UI session support