Edited for JavaDB