Added begin and end time support