Continued refactor, fast data for user collections