Add extras (for CRF) functionality