Adds UserData model and improves exception handling.