Fixes: Adjusted to DAT changes