Offline Data Support added with cosmetic changes