Added cipher selection