More work for the core component