We now have vector classes, use these instead of adding location classes