Change isFirstTime implementation