Refactor. Add more valid mime-types for upload