Finish refactoring of chunk handlers and mapping of data