add in a bunch of stuff to get this working with symfony (again)