Update to support custom titles, other changes