Added pet support and position saving