Make it run as a module

Delayed commit from server