Functionality extended.