Move callbacks into core
Fix specs for downstream build