Reorganized to support Ratchet