Changed to be compatible with CoreBundle v3.0.0