Further refinements to Entities as a result o database changes.
Updated sql databases