appended more refactorings due to symfony fallback