Added 'singular?' and 'regular?'