Quick updates to support has in on and trigger methods