Refactor limited faking and spawn support