Migration to Maven and updated dependencies