Adapted scripts to API changes in core module.