migrate to Spring Loaded