Last changes based on minimal pom definitions