Add support for right to left direction