Convert redundant functions to resources to prevent corruption