Refactored the external/internal method schema (part 2).