Fix structure of Mode signitures for optimizations