Fix hanging
Add symbols