#14 Some more Spring related modifications