Removed double document clause
Added user repository
Added support for old project and user ids