Added support for spawn points