Added changes for UI, Data and Business Layers.