Added Within and bbox
Added Within and bbox