typs and WSH DB added