FileKey refactoring