Add missing modules that are no longer in apricot