Added literal and scope analysis