Updates, implement heredoc and nowdoc