#40 Spring data upgrade