Added Privacy and Squad support (incomplete)