Some progress on symbol aliasing issue
Started work on a fix for the aliasing issue; some refactoring