Added support for non-obstructive usage