Adding object ID and tons of minor adjustments for callback support