Should this really be part of the WAVED namespace?