Add ORM
Update mimetype
Update dto
Commit partial work
Merged master fixed conflict.