Added support for only User on startup