Changes for use as module