Further changes to support Pushover