Fixed refactored data