Added Square, Diagonal, Horizontal, and Vertical qualifiers