Added security module, updates in mail service,