Add class structure; Support multiple ovws;