Performance oriented refactor with adapter holder pattern.