Added oData support and some other improvements.