Improvement update
Adding support for comments