Feature/spring configuration 261