Moved initialization to General.groovy so that the objects are updated properly