Added custody command support to Core