Reorganized Database model