applied work arounds, migrated Oauth2 project to Xtend