More maps commits