Added fake dev remapper TODO