Added filter to handle object permissions