Altered interface to provide extra entry points.