Adding addtional info fields .... resolves #3