Change to Spring Uniform