More work done on Module loading