Enhancer : Rename check_container by valid_container