Fixing data type handling by allowing defaults to kick in