added some more core component classes