Polish + Support for @Import beans