Working on aliases
Refactored symbol types (bad name) and now handle aliases