Updated to FastList and FastMap