Added support for induvidual user