Make GetBaseData support 2 tables