Put doc info in better location