[#35] Refactor automatization