Added extraInfo and lot of fixes