adjusted code to comply to refactorings of vidada.core