Feature 62 elastic integration