Added bean look-up