Added proper bean wiring configuration