Improved performance for maybe