Better handling of components