Added more things including bounding box