Try to retain 0.2 compatibility