Improve path in collection handling