Added support for non-cow animals