Added environments and security