Major update in compiler logic