Better handling of component in/validation