Added current time support