Added spawn location support