ChipHandler refactored