Added more zero module functionality