Updated changes for code re-structuring