Upgraded jbuilder