Added support of extras.