Add again mdsal-singleton but remove prefix DOM