Adding seconds support