apm: ws layer updates, jpa initial impl