Removed dependency on MDS module - CARD-536