Improvements
Integrated user data changes