Improve the management data/properties API