Database modules now loaded at runtime, minor changes