Continuing to refactor background models