Adding date selector support