Suport MavenBuild
Refact
pom fix