DB Structure

Minor changes...