Better handling of components, more options