Moved more spawn code to behavior.spawn