Added Vector and completed Location.