Updated security and views