Added SubView and extended functionality