Added mime type, directory support