Some metadata additions to rm model