Added timer and listeners