More updates for the Swing plugin