Refactoring for Maven Plugin support and improved log

Change-Id: I0fadc27611d7cdbb62d12d647b9670860bd2c0fb