Added support for pets