Add seconds handling