Changes toward OS-agnostic and SQL-implementation-agnostic