Do not depend too much

507