updated to work with Java Spring