Added location and dive models