FX updates => Comments + UML