Added JSR250 support