Added comments, handlers