Added emailqueue and security modules