Re-Commit to fix maven issues