Added security and policies