Pom refactor

Add stopkey to pom