SYS-139: Adding optimize to discovery update