More support for multiple pets. SQL manager needs to be migrated now too