adapt to new core prototypes