Added view support