add support for ways