Add declaration node and change variable & field declarations