Refactored and added support for imported bean definition files