Added support for new core lib functionality.