Security integration

merge security integration