ourtaskr-54 Improve spring context