Added gql plugin support