Restructure contains methods to use public jv methods