Added <tx:annotation-driven proxy-target-class="true"/> and other
changes