Main init module some changes