Updated Database schema