'Animal health improvements should form part of future farm policy'