- updates to comply with core changes