Added security principles and hardening