Added functionalities to odm_server and unit test