#18 refactoring and support for my europeana