Last fixes done.
Pending to fix the maven issue