Updated jqfactory