adding spawn support