Updated interface for use as module