Adding Session and Lock handling capabilities