Updated solution so it all compiles with new user objects.