Updated to support bounding box