Added when as a dependency