Removed load-on-startup to see if this will allow loading in cloud