Some changes to be ready to use new mva-crud module