Add scripts and comments handling