Map statements ordering test + Map interface updates