Add support for more boxes