Improved owner function