Changed alias handeling
Adding code folding