enhance JMS gadget (in progress..)