Generic changes to support JavaEE