Update to work with JDA