Added Shell and FluidDb