Upgraded xbean