Add missing Only wrappers