Upgrade procedure (fixed to jdk7 compliance)