Usage improvements