Added Database encoding to fix some issues