Refactored the internal and external method schema.