Updates according to Gotham additions