Added site module support