Fixin mapping tables