Updated component entity module.