Updated routings, security & helpers