Updated to include database host