Few changes in source code