Refactored components so calls to the callback include a list of int args