Added 'self' pointers to struct function pointers