Add data option and tests