Added UserStorage with exception