Changed from static to instance
0.7.0