Chip class refactor