Upgrade code for last version and new requirements