Add owner check