Updated API, fixed Maven (again..)