Add support for push and fetch