Upgraded activejpa