Issue #33 - multiple DS support