Replace variables with callback to retrieve value

Replace variables with callback to retrieve value #21