[21 may 2014] Migration to Spring first try