* fixed server error due a deprecated method * refactoring Change-Id: I25f193d54f0953d1e6dca19553874b0bfe69e947