Updated database to make it compatible with Android