Better cart handling