Added suport for custom views