Updated spatial classification