Feature/371 protect all file types

@mturalenka Please review