Updated for magical record integration