Dependancies improvement