Added optional feature hook