Some Improvements. Waiting for upgrade license file