Fix Lingor Issues and update DB Schema