Added support for Visibility