Core functionality extended.