Addapted to maven project