house keeping, and added new Database Schema