Modifications necessary for Spring to work