Refactor to support many bins