Refactor Services
new Database scheme