Updates to ensure maven import / export into eclipse