added session support
updated set method