Added commants and make use of common annex parse util methods.