This class will likely be removed for v0.3