#5 Improve semantic in contribution part