New version including part of the fact table load