Adding new modules
Added various changes to get it running clustered.