Fixed final comma problem with collections