Rewrote the Metadata parsing to include ccomments