#244 - Switching to use the latest MDS module