Removed database names and ' where unnecessary for better compatibility