Expose core as well