Moved DoD and DoD:S to working