issue #3945 Refactor base data