SecurityUtils improved