Added mail and surveys modules