General update. WMFS added too...