added some more boxes support