refactored imports for spring4 updates