Lead support
Extract custom fields logic to a module