Adding support for FF21 and FF22