Reworked list and map factory registration