Added support for new corelib features