Rework mkData