Updated due to new core module.