Added more stuff for autowiring and autodiscovery of beans.