new dms_core stuff for testing