Some code improvements. Now depends on OMV 0.5.14.