Moved things around, to make it clearer what is a reference data and what's user-data