Source report refactor