Now uses direct mapping by default