Update symfony and refactoring