Database Schema minor changes

Database Schema minor changes