Improving depedencies to avoid core depend from maven