Added some functionality for commenting