Added user data fields and tests.