Handle dependencies a bit nicer