Added variable spawn point support