https://wso2.org/jira/browse/CARBON-15003

The improvements suggested with the issue https://wso2.org/jira/browse/CARBON-15003 is implemented with the development branch.