UI Plugin changes