Improve ExternalButton definition