Introduced new classes to handle alias and function scopes