Database & Environment detection adjustments