Updated security and SPA