[GA] changes to get plugin working