Modifications to support generic features