Added arrow support, properly this time