Added better support for static views