Refactored fill calls.