Added support for detecting owner