optimize spatial and update poms everywhere