Added functionality for data persistency for Android.