Adding new hook to enrich Conversions + minor changes