Feature/120 auto fill contributor