Removed Username/Password, Added OutputType