Converted to Spring-project