Security improved