Updated for khepri V1.0.0