Updated to use ActiveAndroid for persistence