Added more services and security enhancements