Make Functions co-exist with Actions (refactoring)