Upgraded to new core libraries system