updated to use doctrine common