Added support for user searching
Updated versioning