FUL-31 - Improve documentation + migrate to sf2.4