Added spatial support