Added user support (not completed)