Security check added