Better API, based on namespace checking