Changed to Spring Annotations