Refactoring for RESTDroid 0.7.2.x