adjustments from vidada.core refactorings