Use rest
add handles for date type