Added sub views handling