Updated Schema format and updated range for between operator