Add Options Class
CVTest update/ structure need to revised