Update following up to CoreBundle integration (PR 6 on CoreBundle)