#45 Hide the internal API