Made vectors and rectangle use template types