Source function enum
Refactored order of arguments