We need to make a refactoring. Core of Refactored API will looks like below. 
