Add add* functions, add type hints, shorten namespace declarations