[CAML] Refactored to make more sense...