Add comments and XML configuration