Added identifier table support for scope