Issue with dependencies, far from perfect :(