Fixing support for bean definitions.