improve security context