Refactoring the code to increase the performance
Merge branch 'master' of https://github.com/wso2-dev/developer-studio