Add spike handling