Lightroom 4 is much better about keywording than it used to be. That is what I use to catalog all my images, film and digital.