Fixed #3 Changes: database schema