Used hash as file key
Minor fixes