Added better view support