Migrate to CoreBundle