changes to context and pom