1.0.3
Use singleton