Add option for forcing returning original data