In the works for v1.2