Add database loader, +some fix
Fix some error