Added missing implementation details.