Background data refactor