Added suport for different view wrappers