Changed struct function pointers to static functions