Big Honeycomb refactoring