Switch to Stream for better performance