Implemented JH's changes down to genre-class
Implemented JH's changes down to originInfo-class