Improve OOPability
Improve OOPability