Refactor chunk calls