Moved towards django-inspired InfoDB