Looking at the designs now we won't need one for file etc. Can you just implement the consistency in the keys?