Definitions changes and commenting