Component class improvments