Add support for arbitrary boxes