Removed helpers. Changed collection handling.