Added spring configuration and context