Made security section a bit more robust.