Adding Caja logic.

Adding Caja logic.