First drop for JSR356 Support