Improve admin for the new model [RD-62]