Added spring helper classes