Better support for user data