Updated spatial solver api