Various changes
Rel DB broken