Save original metadata and add user friendly messages

* Add missing new classes.