Added new types of locations