Added parsing for comments