Added upercase support for directions