Make AWS plugin specific options optional instead of required