Various usage simplifications