Updated instances where encoding was explicitly specified