Re #1709 Modified API to reflect changes in Corelib