More Spring Config changes