Update for marv v0.4.0