Design adjustments for Security