Refactored builder item registration to be a little more robust and hopefully fix and lingering registration issues